Skip to content

Pin core, generation, generators and runtime conformance at their reorganized tips - #147

Merged
Kinflou merged 2 commits into
mainfrom
core/keyed-unverified
Nov 9, 2026
Merged

Kinflou merged 2 commits into
mainfrom
core/keyed-unverified

Conversation

@Kinflou

@Kinflou Kinflou commented Nov 9, 2026

Copy link
Copy Markdown
Member

Moves the CLI to core 1669a2f (which has core#239: unverified::protocols() gives each reason already rendered and quoted) and to the generators and runtime that agree on it, with the runtime reorganization's paths (ComlineProject/runtime#111) folded in.

Pins

Crate Before After
comline-core b933209 1669a2fe4dbc5592a96a2964d7ae13e985b76701
comline-codegen, comline-doc-markdown, comline-doc-html (generation) bb89a51 6a73541e142ba5895fd628ee444449694382e70a
comline-codegen-rust de0b8e5 eb04c130356e44a2b88b74a6805e24d0e80bdbcc
comline-codegen-typescript 9952c5a 4cad8af36f807f395bdf83dcc29aa290187ca0d0
comline-runtime-conformance cf5e067 3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51 (runtime main)
tests/fixtures/conformance: comline-reference cf5e067 3b9cc9d
tests/fixtures/generators: generation crates 55d3fdc 6a73541
tests/fixtures/generators: comline-codegen-rust be90c80 eb04c13

Generation is at 6a73541, not at generation's current master (a393c8f): comline-rust eb04c13 and comline-typescript 4cad8af pin 6a73541, and Cargo only unifies a git dependency across identical rev strings. a393c8f differs from 6a73541 only in generation's conformance goldens and dev-deps (generation#131), so the generator crates are the same code. The fixture generators are real pins the tests build (tests/cli/external.rs, conformance.rs), and are meant to be the same revs as the CLI's so output compares byte for byte.

Code

src/commands/accept.rs: the reason now arrives rendered and quoted, so reason: reason.map(str::to_string) becomes reason, and the message format!(": \"{r}\"") becomes format!(": {r}"). No fallout in src/commands/conformance.rs from the runtime-conformance bump: it uses runner::{judge, parse_reply, questions, Corpus, FactProof, OPS_PROTOCOL}, Answer, Case, Outcome and Profile, whose public surface didn't change in runtime#88..main (the catalog-backed fact constants were added).

Lockfiles

Cargo.lock and the two fixture lockfiles are tracked and were updated by cargo fetch only (no cargo update, generate-lockfile, or build). Package-level diff, by name and version:

  • Cargo.lock (418 -> 396 packages): the pinned git crates above change source; comline-catalog is added twice (the specification's, which core already used by pin, and the runtime's vendored copy, which comline-runtime-conformance now depends on); and these registry crates are dropped because the runtime no longer builds package_abi: abi_stable{,_derive,_shared}, as_derive_utils, const_panic, core_extensions{,_proc_macros}, generational-arena, libloading (0.7.4, 0.8.9), lock_api, parking_lot{,_core}, paste, redox_syscall, repr_offset, rustc_version, tstr{,_proc_macros}, typed-arena, typewit, winapi*. No registry crate changes version.
  • tests/fixtures/conformance/Cargo.lock (55 -> 22): the three runtime crates move to 3b9cc9d, comline-catalog is added, and the same kind of removals, plus a few others that only package_abi pulled in (crossbeam-*, libc, scopeguard, semver, smallvec, windows-link, syn 1.0.109, bitflags, cfg-if). No version changes.
  • tests/fixtures/generators/Cargo.lock (68 -> 69): core (d11d82b -> 1669a2f), the generation crates and comline-codegen-rust change source; comline-catalog is added. No registry change.

Part of ComlineProject/runtime#111; follows core#239 (and core#240, generation#130/#131, comline-rust#116/#117, comline-typescript#155). Closes no issue.

Testing

Not built or run locally; CI covers it (build, test, clippy, rustfmt, wasm fixtures).

@Kinflou
Kinflou merged commit 0d4bc2e into main Nov 9, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant